From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Tue, 19 Jun 2012 20:41:39 +0000 (-0400)
Subject: mount-operation: close the password entry on operation abort
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6455
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=de73128d47959cd8938b0ea0d7ed767251355427;p=gnome-shell.git

mount-operation: close the password entry on operation abort

If the device disappears in the middle of a mount operation, make sure
to dismiss the password prompt automatically.

https://bugzilla.gnome.org/show_bug.cgi?id=673787
---

diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index f7fbb1890..b91850fa2 100644
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -157,11 +157,19 @@ const ShellMountOperation = new Lang.Class({
     },
 
     _onAborted: function(op) {
-        if (!this._dialog)
+        if (!this._dialog && !this._source)
             return;
 
-        this._dialog.close(global.get_current_time());
-        this._dialog = null;
+        if (this._dialog) {
+            this._dialog.close(global.get_current_time());
+            this._dialog = null;
+        }
+
+        if (this._source) {
+            this._notificationShowing = false;
+            this._source.destroy();
+            this._source = null;
+        }
     },
 
     _onShowProcesses2: function(op) {